radsecproxy: Fix compilation without deprecated OpenSSL 1.0.2 APIs
authorRosen Penev <[email protected]>
Wed, 2 Jan 2019 07:52:00 +0000 (23:52 -0800)
committerToke Høiland-Jørgensen <[email protected]>
Tue, 8 Jan 2019 14:19:00 +0000 (15:19 +0100)
Signed-off-by: Rosen Penev <[email protected]>
net/radsecproxy/Makefile
net/radsecproxy/patches/100-openssl-deprecated.patch [new file with mode: 0644]

index bfb2eda1a80969bc7fc932e6a1e6d6d3f17d3ef6..76a1a3ca90f28b0e4e9112ce7826c272ab33da15 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=radsecproxy
 PKG_VERSION:=1.7.2
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/radsecproxy/radsecproxy/releases/download/$(PKG_VERSION)/
diff --git a/net/radsecproxy/patches/100-openssl-deprecated.patch b/net/radsecproxy/patches/100-openssl-deprecated.patch
new file mode 100644 (file)
index 0000000..24c2140
--- /dev/null
@@ -0,0 +1,22 @@
+--- a/tlscommon.c
++++ b/tlscommon.c
+@@ -44,8 +44,8 @@ static uint8_t cookie_secret_initialized = 0;
+ #if OPENSSL_VERSION_NUMBER < 0x10100000
+ static pthread_mutex_t *ssl_locks = NULL;
+-unsigned long ssl_thread_id() {
+-    return (unsigned long)pthread_self();
++void ssl_thread_id(CRYPTO_THREADID *id) {
++    CRYPTO_THREADID_set_numeric(id, (unsigned long)pthread_self());
+ }
+ void ssl_locking_callback(int mode, int type, const char *file, int line) {
+@@ -69,7 +69,7 @@ void sslinit() {
+     for (i = 0; i < CRYPTO_num_locks(); i++) {
+         pthread_mutex_init(&ssl_locks[i], NULL);
+     }
+-    CRYPTO_set_id_callback(ssl_thread_id);
++    CRYPTO_THREADID_set_callback(ssl_thread_id);
+     CRYPTO_set_locking_callback(ssl_locking_callback);
+     SSL_load_error_strings();
+ #else